Changed syntax to use "table" and "on" in model declarations