Fixed Bugs with storing variable production data