better method names, javadocs in datamanager