Refactor data encoding; storage class reads real data now