Added hopper compatibility