Fix #31

Separates Input from Attributes for proper validation.