cs
use the event system to map fields
Merge pull request #136 from greg0ire/use_event_system

Use event system