Improve several methods integration