Global Functions now integrated inside Companion - Fixes #502