Removed global calls

Now using registry instead