Added optional prefix and suffix options