Added support that is needed for test to work