refactor packages name, fixed limit and event feature