Major updates on features