Add new models for fk and m2m fields
Updated chucho with advanced searching