Refined API
Added license