Add and update the remaining aspect files
Avoid proprietary API