Added more extension methods