Removing defaults, and throwing in support for EL as well. Testing.