Optimize custom variables
Update to 1.2