Add support for more types and continue keywords