User data support. Fix #44