Added proper Base scripts