Admin v2 complete. Big fix model package