API improvements
Version 1.8.0