Fixes #2 - Improve/add attributes