Improve supportability and add more comments