More work on proxy generation