Refactored entities
Update Article is now possible