fix models info
add file name in model list
more fixes on properties scope issue, use singleton instead