Expand current API (1.0.0)