draft mapping models and queries