Reduced parameters and used site location instead of database location