Removed usage of FactoryInterface and adjusted bindings.