Second commit with services integrated