Improve path and transform adapters