Develop - Changes by Yogesh

Updates for performance improvement