Adding data checks to public methods;