Updated registration logic;