Updated layout
Updated doctrine compat and reworked model