Updated views to use keys