Updating build to include all the AM components