Changes to minimize verbosity