Added Manager template class, updated related code