Added prefix and suffix