New entities system. Works as a charm!