Support for fixtures
refactored a bit