Improve Components inflate function, close #130