Sergey/resources inhancement