Added Map and String converter