Added some more attribute stuff for the client side