Added new client layout and ClientType enumeration