Add parsing for basic shapes (without polygon).