API Update

HashMap added