add possibility for runtime added tables