Optional alternative container

Simple commit to give the possibility of adding a different container besides `window`.