Improved location, started parser and entities refactoring.