New api with java.util.List
cleanup
Refactored
Stuff