Major improvements
- revert setter namespace