Added an interface, hashmap, etc.