Add Type/Code and Q