UPDATED: Define the DS constant in admin and site
UPDATED: Use legacy classes