re-factoring storage services to pure java 1.8