Add some stuff stolen from YADR