Adding register support