Refactor and updates

**Reference:** :no_entry_sign: