Added initial address field
Removed not implemented code