Changes to merger into seperated core-user module