PM|GR|RD: Improve custom variables