Feature/no sql injections