Switched static services from fields to properties (still ugly)