Re added some Features from 1.6.x