Custom entities, major support bug fixed.