Add security Will need more code cleaning