Final plugin split, custom checks are now separated