Objects and code improvements