- Constant PRIMITIVES_DIR has been replaced by SYSTEM_PRIMITIVES_DIR.
- Minor fixes in methods visibility.