Moved address to parent class