Added optional invoice fields