More functionality to ets adapter
Final touches on the ETS adapter