Adding script attributes
Refactoring naming