Add checks and log to all steps