Data improvements and web helper
Data retrieval improvements