Moved to reuse of CommandBuilders via generics