Adapted user structo to make room for new features in future releases