Added signature parsing