I prefer changing returned type of getContainer(). But Christopher Elkins is thinking else
Do you want me to fix it back or leave it as it is ?