Improved runset functionality