Added components to spec file
Merge branch 'feature/java-8'