refactored: added module user and note