Added weights support