Adding some Api optimizations and more dummy data