Extension method improvements