Dynamic data usage [1/2]

Change-Id: I815f6a773375a855514bc9a6517f292ffcc157a2