Updated to include custom scripts