Updated Debug and Release builds