Added prefix and suffix dependency support