Added Registration in TODO