Added TODO to introduce spinner