refactored for Pod support

Signed-off-by: khalid <mustkre8@gmail.com>