Added more Doc types and edited