Defer field and repo creation
Refactor field disabling