Replaced inheritance with source in complex fields

Resolves #24