Improve guard configuration