Fixed up models and async loading