Updated operators + simplified container builder