Issue #13: Support field selector