added implementation support
fixed buggy export problem