Feature/security issue