Removed chaining. Reduced reuse with traits. Removed 5.3 support.