added better support for handling of the blockchain