Optimizations, changed to properties