Changed annotations to use a hashmap