First pass on Spray support