Removed dependency on views