Adding some flags for scan