Move body semantics into handlers
Update metrics config