Making enhancements in aai simulator