Custom proxy type & annotations update