Adding module and singleton pattern