Moved some models further into the process