Refined API, added tests