Added compatibility with new resource concept
Bumped version