Feature/resource2