Adapted to latest STD A1 API spec