Updated to simpler config. Added joda mapping support.