Updated to using custom OGM