Fix data transfer states and not use static methods
Update handlers