Merge pull request #135 from greg0ire/backwards-compatible

Replace most occurences of listener with subscribers
cs
use the event system to map fields