Clean code
Add List support