Added more data casting stuff