More [currently untested] functionality