Improved Entity integration and drops