Branch fix not declared property _type and fix code for PSR2