Podspec refactored