Added --database option