Added static service aware trait