Update for awesome v3.5