Added Resources
Made resource aware