Add Box class / some changes