Instead of enum dispatch, use generics and dynamic dispatch to build …

Instead of enum dispatch, use generics and dynamic dispatch to build … #99