- Changed Hashmap Declarations
- More Pom.xml Fixes