Refactoring database instrospection strategy in ORM, adding annotations strategy to orm, fixing docblocks and other small problems