TODO: Awesome 3.5 compatibility