Complex key support
Select columns with joins support
Project cleanup