Add checks to methods