Added return values for parser