Improved abstraction and code security

Change-Id: I7f41d82d05a06b12bae28b9e520c145009e75cd4
Signed-off-by: PeterLaker <stav.saad@gmail.com>