Better syntax and attributes