Improved plugin support. Added computed attributes.
Fixed computed order.