Switched to use proxy instead of reify for flexibility