Added service related components