changes to the backend and generic container classes