Constant Substitution implemented in repository