DDBEASY 223 - Functionality improovements.