Slight refactor of SDK methods to ensure no strict standard warning