add support feature and bugfixing