Better handling of primitives
Source Aesthetics