Revert to e95eabc
Implemented view/refresh for objects