Rewritten checks to be done by service, added notification