Changed to support library for spark