Add traits and default coercion rules