Rebuild as singleton
rebuild as singleton