Removed warnings, implemented Generics, extending Collection and Map