Type Save Querys added. No Javadoc at the actual time
refactored after merge
test refactored after merge