Add define and fn, allow more characters for ident