BZ-12884 pass ds and portfolio as attributes