Moving framework dependencies to the framework