Fixed: Latest changes to models