Added dynamic controls partially