@trustin I think I could even remove the javadocs as these are on the interfaces anyway ?