Added simple registration mechanism