Tried to keep changes at one place while not abstracting things too much as we have don't need any complex functionality yet. Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>