Updated with Registration feature