[MOD] Separation of ogd class into multiple methods