Added draft rendering + type
Merge branch 'master' into draft