NEW: Implementing new objects hierarchy (in progress)