Improve questions system