Improve interface

- Split class and method
- Remove redundant property