Added more switch sources; Added java support
Added java (forgot to save)