Update modes; Migrate to apache