Add possibility to do not use weights