moved fields to ok_api, few improvs