scap model added and few changes
code maintenance