Removed todo
Moved accessor code to templates