[ADD] improvements to work with version 8