Added data stubs and javadoc