#22 Initial support for use handling