Added inline errors support