- Improved performance of shape observable
- Moved useful functions to Utils