Updated model and caching

Added uniqueID and filtered to model