Added Map and Type helper classes