More attribute -> method conversion

Change-Id: If6e9f5e026b62a17619e41eb2843a68eb7430c58