Fixed logic
Introduced registration model