#18 + #24 - add to StartingAt query
#18 + #24 for CallingAt query
#18 + #24 - support Get TM endpoints