Change to BooleanFields for binary fields