Full DBCP Support & Slight Data Model Changes
Test reorg incl. content type awareness started