Refactored object classes a little