ATCAD Handler improved