Adding befores and afters to add run support