Add Uriable interface and listener
Merge