Added AbstractEntity