Add CUser plus small modifications
Add support for submenus