Added all options for the categorymap and reference service. Need to add unit tests though.