Make clear optional; Check for spring runner