Improve support of Fixtures