Better stayles and more accurate API