Moved common fields into a seperate feature to avoid conflicts.