Simplify singelton registration