Refactored tables - state condition