fixed references

Signed-off-by: Arvind Chembarpu <achembarpu@gmail.com>
readded validation support

Signed-off-by: Arvind Chembarpu <achembarpu@gmail.com>