Added Single in square support