Updates to latest basic-template