Fix configurable concern + add guard