Use more constants in object data