Adjust injection to work with new layout