Added entities, seems to be good now :D (edited with updated format)