Updated to be more simple about loading objects