Add checks in controllers