DocType v6.1. refactoring

DocTypes now using 6.1.x only API