Update naming
Add generic object
Cleanup unit functions