Move initialization in constructor to @PostConstruct