Improve crack and reference condition constructors