Extends basic API
0.2.1