Content Object Logic Improvements