Adapted to new name convention
Internal optimizations