AVCDATA-554  adding some additional controls