Dev/singleton module registration