Added resources
Enhaced code