SVENDK-355 Added design changes