Added checker and other methods