Added remaining functions for parser