Update to TrollCommons