typed api access

Change-Id: I9d6e0c8cc53e0bcf188d572c655c7a28e3e0dae2