Cleaned return formats in base class since they're used rarely