Bug fix and Adapted to Registration changes