New drawable types and some fixes