Some fix
Add method valueExists