Feature: refactoring + delayed post parsing