Continue implementing parser