Added Custom Value support