Synced with Scalagios layout API changes