Restore user module changes, to be refactored