Adding simple registration mechanism