Updated for more view controllers class