More work on the Merlin.State, added extends to Merlin