Cosmetics
Added support for system wide usage