Small improvements
Adding extra objects