Changed structure of ninja to use only one table