Added more default attributes support