Fix for cases when tables are not defined

Fix with proper defaults now