Added new resources.
Addapt implementation to new data structure