APOLLO-3027 Updated domain module to store a systemType#