Added Content Elements support