API

Improved API with new methods