Refactored base and parser to more clear code..