Added rule checks