Add database check if entity exist
Added fix to the service
Merge branch 'master' of https://github.com/ojbruce/VDMExtractor