Remove stub-class
Add coordinates