UPDATED: Eluna
Added GUID support and methods