Undoing idea with prefixed Keys
Removing not needed cast