Refactoring + implement parsing part