Added remaining core files