Issue-18: Simplify scripting [core]