Improve ergonomics of xtra: https://github.com/Restioson/xtra