Updating the codebase for full Alpha-1 testing