Added battery and no battery variations to package