Added optional table and layers