Cleaned up object extend