Updates for Alpha release