Formula parser added