Issue #3 : security access related changes