Added fixture adapter and added id property back for fixtures