Updated with latest changes from angular full stack