Added view override support