Added special cases for BooleanField & FileField