Auto registration feature added