- add __based support