Adding support for self fields. (#33)