Move security method to right class. Fix push