Updated offline module with increased speed performancies