Some extension methods added