Improved object structure + Added Wally feature