Added further security & validation

Related Work Items: #179, #180