Adding Spring compatibility