Cas: minor design changes