Improved start/end fields