Add properties functions and maybe types.