Add enums for reference entities, modify service interfaces & impls