use base model fields.
Merge branch '0.4'