more work on dynamic proxy mapping