Remove constructor.parent and extend atoms