Infrastructure Amendments

Fixed the problem with the functions having the wrong scope.