Added optional fields