Add option validation
Update hash reference to symbols