Added more builtins

1. measurement
2. moment