Fix objects needed viewlet and enhance initial setup