OMX 2.2 model changes + generic layer catalog service improvements