Changed to work with the own Morrow Core files