More work on Address and Device implementations