updated service loader to use new layout