Removed need for eval for global functions