Changed to custom build
Updated access to JS props