Updated to support AMD and node