adding syncing and inheritance support