improved script container support