Changed parse for new functions