Fixed register map structure

Fixed map structure for the register functionality