Reworked deps, seperated factory to extension