Handled TODOs
Java path extracted to a variable