Add attribute object handling, fix multiple @ usage