Issue #70 - Replacing current static resource keys with new dynamic keys

In this pull request, I have merge recent changes from original repository and completed refactoring we started last time.