Modified @krmarien's entities a bit