Updated Fixture Class