Cleaned up models & added new migration