Added OptionSelector, toilet and glass