Removed computed properties into a plugin