Improve runtime behaviour