refactor on attributes, fix ci
more refactor on attributes