Titan : class structure updated