Updated functions to include common items

Signed-off-by: Azlan <azlan.cuttilan@pentangle.co.uk>