Fixed injecting Properties for optimization