Removed compatibility and forced supplying UUID