Improved modules and register functionality