Update Non-changing classes

changed Map Interface to what Kip updated