Fixed the model to ensure all objects in the latest commit are in 'current'