Add proper handling for boolean fields