Adding some of missing functionality