Improve functions + Add execute script