Improved registers mapping