Fixing #6: adding a first class service standards lookup