Implement Lists APIs
Refactor