Security improvements - 0.2.0