Improve security code - Rome meeting