Setting functions added and tested