Updated titanium definition using inheritance and enum types