Fix #1 - Attribute and dependency issues