Refactored a bit to support "raw" values