Added a few more special attributes