Refactoring, many new Combinators and extensions