Removed static modifier from Entities