Moved conditions to their own table