Updated to remove Activator