New layout to support new Database