modifications to service beans.

Signed-off-by: Kavith Thiranga Lokuhewage <rc404mekt@gmail.com>