Address Issue #3
Updated to support latest Types mapping.
Issue #1 and #2 addressed for Registers and Schemas.