Add attribute readers
A lot of code changed...