added support dexterity content types, cleanup