Map related classes were added for 0.0.7