Updated scala, objects lazy accessors, refactored identifiers.