resource class is little bit refactored now
all parts use new resource api
fixed fields typos