Added parse rules and refactored