Changed api of registers a bit
Rearranged where register ids are placed