Refactored blockDao and articleDao