added more scanning features
restructured DB