Added lazy props and added slightly smarter media files