Updated javadoc return types