Improve some objects and adding labels objects