Refactories name classes, new query to count working days