This should be handled via repository