Improve logic accessibility