Added custom checks