Added more standards