Resolved multiple dependency issues
Pre-release
Pre-release
Move soft dependencies into functions (#481) * Move soft dependencies to functions * update * update * update * update * update * update
Move soft dependencies into functions (#481) * Move soft dependencies to functions * update * update * update * update * update * update