Added more sprite support