Obervation parser refactored