Changes for cleaning up of preconditions