Simplified setter logic