More work on Uno Adapter