Replaced hard-coded dependency with dynamic one