More future functionality plus resources template update