added more parse functionality