Refactored Func dependencies

Still need to fix rule based factories