Moved container checking to Input class