Added UUID to core module