Added entity in the table. But it's fare from pretty. #136