Further refactor of object utilities